Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 21:46:32 +0000 (14:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 21:46:32 +0000 (14:46 -0700)
commit6c0f6927c78fdab3f82cc60f8e6639d47fa1e097
tree313a4e631be4c2a8a7eda4bde3bf049a4cdbe7b8
parent9c57d3672a825345dbf72712e2cd470efcc346ed
parent26cd6ffe3242780834538ea921b5015b59d0d5be
Merge from trunk.
src/ChangeLog
src/xdisp.c